Skip to content

[OCPCLOUD-1586] Update ControlPlaneMachineSet API from openshift/api#54

Merged
openshift-ci[bot] merged 3 commits intoopenshift:mainfrom
JoelSpeed:update-api
Jul 4, 2022
Merged

[OCPCLOUD-1586] Update ControlPlaneMachineSet API from openshift/api#54
openshift-ci[bot] merged 3 commits intoopenshift:mainfrom
JoelSpeed:update-api

Conversation

@JoelSpeed
Copy link
Copy Markdown
Contributor

@JoelSpeed JoelSpeed commented Jul 4, 2022 •
edited
Loading

This updates the API based on openshift/api#1216.
There were a few changes to the API made within that PR that need to be accounted for here, mainly the changes of the AWS resource reference discriminator values and then some clarification of the status fields

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 4, 2022
@openshift-ci openshift-ci bot requested review from alexander-demicev and damdo July 4, 2022 12:44
damdo
damdo reviewed Jul 4, 2022
View reviewed changes
pkg/controllers/controlplanemachineset/status_test.go Outdated
ObservedGeneration: 3,
Replicas: 5,
ReadyReplicas: 3,
UpdatedReplicas: 2,
Copy link
Copy Markdown
Member

@damdo damdo Jul 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is 3:

id0 - updated (and ready) +1
id1 - the pending one is updated +1
id2 - the pending one is updated +1

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 4, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 4, 2022
@JoelSpeed JoelSpeed changed the title [WIP][OCPCLOUD-1586] Update ControlPlaneMachineSet API from openshift/api [OCPCLOUD-1586] Update ControlPlaneMachineSet API from openshift/api Jul 4, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 4, 2022
damdo
damdo reviewed Jul 4, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 4, 2022
@JoelSpeed
Copy link
Copy Markdown
Contributor Author

JoelSpeed commented Jul 4, 2022

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jul 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 4, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jul 4, 2022

@JoelSpeed: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-disruptive 9aa7364 link false /test e2e-aws-disruptive

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-ci openshift-ci bot merged commit 5543fe1 into openshift:main Jul 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@damdo damdo damdo left review comments

@alexander-demicev alexander-demicev Awaiting requested review from alexander-demicev

Assignees

@damdo damdo

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@JoelSpeed @damdo